Some Further WIP

Some obvious tightening to go in several places.